Started work on model core (TBC)