Dat Big Refactor

A team effort between JD and SC, our goal is mostly not to change, but to understand and clarify... mewstly.