an evenings misc. work, probably should have committed a bit more... oh well