Checks that are no longer relevant
fixed merge conflicts
dumb
A lot more functionality