model modify, halfway
ready to merge to master