WIP: New Design, working on restructuring some things