Partial commit, please ignore

Will be deleting momentarily