Major overhaul. Using Codekit for simple testing