me and git have some serious talking to do...

recommitting #3