Starting an initial cut; very WIP, about to move repos