Initial commit, groundwork almost done