feature1 complete

new feature complete, pull this into master pls