Change how the manager and states work, add ability to pass bundle between states, remove unused imports