Floor plan for 2nd floor

We've been talking to a contractor - Gary - who pushed us to come up with layouts for the two bathrooms on the 2nd floor.

I love this free program at floorplanner.com; it even lets you choose flooring and colors and whatnot!

Dan's addition to the post
Currently this bedroom looks like this:

 And where the master bathroom will be currently has a 2nd floor kitchen:

 And where the shared bathroom will be currently has a funky small bathroom:

This is going to be our really big ticket reno. Isn't Ayumi's little layout cool? She's already picked out tile for the master shower. haha.