Some WIP code, overwriting this on git tomorrow