Challenge Complete

Working and tested (ignore .swp file left over from vim)