Syncing up

just throwing this up since i'm behind on commits still work in
progress.