hours worth of changes

oops