Added some more functionality, making progress