Added a few small things
Added Classes to code