New architecture

Should clean up a few things.