adding states
adding controller
just commited for blake
moving controller