added minor todo + codekit shizzle