Crudely merge Ability and master branch.
Don't do this at home