Dunno, a bit more work on architecture

@TODO Need to start organizing my work a bit