Revisions

So, I'm looking at my office and it's been revised again.  I've taken out a couple of desks used as testing areas.  Unfortunately, they are not being used properly in their new location.  I'm facing the possibility of needing to build a lab for testing products.  I'm also entertaining the idea of changing up how I use my computers. 

Right now, I use my Mac Pro for editing video and editing Gadgetell.com.  Since that is the case, my editing station is a mess.  Are more desks the answer?  More dedicated spaces to tasks?  That's how a house works, right?  Many rooms have specific functions and maybe that should be the case for my office/lab/guest room/Skype studio.  Maybe a large + shaped room divider in the middle of the room to subdivide the spaces?  I'm just thinking by typing.