Added basics, added some tests
DRYing up the image switching
Updated some of the tooling config