Architecture in place

Well. Almost. But yes, basically done. Moving on to commands