some more entities added, should be enough for a start...