MAJOR UPDATE

Haven't updated the git in a while, this is the result.