Made some initial changes, but in the reaper -_-