Added some basic functionality
Basic functionality