Commit with some real stuff - actually all the important stuff so far