Version 2 with quick disconnects for the battery and switch. Still a little bit more cleanup before I post the files to thingiverse.