Got basic functionality tested and working
Added some basic things