reworked entities
half work done - add post