Update

Start of architecture overhaul.