Committing what I have so far.