some more functionality, not functional at the moment