Updated Main

Main2 is the new stuff