Added the QuickAddController and moved some of the code to it.