finish work on basic model