lots of updates... need to make more commits!