Adding test
merging in Jims stuff