Added some class structure
Added a tiny bit of functionality