Adding for safety, have started implementing classes
Got very basic classes working