added some commented out code that works, that we will remove later