Added incoming controller, logic setup and model association fixes.