Feature 1 work

would like to add this to master