Started work on the entities system