Started on entity resource loading, and code cleanup