Converted states to new inheritance.
Reverted some stuff. Queued objects now get removed.