about to start fixing the model
fixed merge