Did tons of stuff so figured I should do a commit