Office wip

Still not complete, merging as a milestone