aaaand rolling back, gotta fix some things first