Added some basic functionality

Added some basic functionality