[WIP] adding new models