More moving stuff from the model back to the controller
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>