untested code

Added some stuff