Reworking architecture, everything is broken! :D