modify COMPASS to take y_s, y_u as intputs; get discrete, continuous models working

- still need to bugcheck / clean up / refactor modelling code