began adding tags
fixed controller merge