Greg branch

Though it would be a good idea to show more enthusiasm and delete some stuff.