Overhaul, implemented John's model and added primitives for furniture