Basic functionality added
Still just testing code