syncing up

current progress as of 5-20