finished basic model testing
fixed merge conflicts