update for first fearture defs for merge
fixes
put in link in controller
added code to controller
last update