updates to base controller and model and test scenarios

Signed-off-by: Austin Ducworth <austin@ehousestudio.com>