fixed template
Merge remote-tracking branch 'origin/testbranch' into TylerC
Merge branch 'TylerC' into testbranch
improved needhave controller (still not totally right...)