Moving WIP code into repo