Commiting what I have so far.