updated models, addition of dashboard model, all variables back into their own classes