Adding entity-drawing and some other functionality