finished adding all old code and went over it to make sure it works with macs now, was done prev on windows