Added the classes. Now we just need to start adding in all functionality