this is the version i had worked on until thursday