Initialization cleanup
Initial prototype of switching model