master new w/ classes

Classes are added to run in terminal