Added some very basic functionality