Add some easy things
merge