Basic code implemented
deleted model
Merge branch 's2'