A lot of stuff was broken before because I failed to commit...so I fixed it!