Progress on cases
Fix method cases
Camel case variables
Pull master changes