finished with all the basic things now on to the extra time stuff as well as fixing some things