merge
reconfigered to use codekit over