Changes to a3, adding a2
adding kittens and modifying a3
merge stuff