forgot to sync while working yesterday!

finished part 1 & 2 as well as association methods