All this stuff I really should have committed