I have been working on this for the past few days.  Not sure if I’ll be done tonight or I’ll find SOMETHING that I don’t like and end up changing it (I have changed the floorplan at least 3 times so far).