Committing all the stuff I have so far