Fixed some more camelCase, added contact to context
initial