Storing WIP here. Will need to squash this commit.