Bug fixed with Memento + Observer and ECS cleaned up a little bit