welp, hopefully near working order
update things to use proper users
hmm...