Almost done version 1 work