Adds some functionality, not completed