[wip] continued unit testing and progressing on model side