Initial work

commented out code