Updates to code
Main class