More rewrites, added all objects except for debris as entities, more to come