did all the things

Please review and merge