wip

Feel like there's a concept design somewhere in this. Dunno where though.