Updates to cope with new model, entities lighting up now working