added some stuff to entities and implemented more of Parser