a shit ton of changes, whoops