updated basic working model
todo