added entities; started implementation of manager