Removed unused bundle, working on entities
More work on entities