WIP: Major Maki Refactor

This is a re-organization of the POC code into a more manageable prototypical format.