Updating Groovy branch to include changes made to Fuerte branch where main function was cleaned up and everything is done in the class now.