Commiting so I can work on this tomorrow during my lunch break