Complete functionallity, also removing entities