updated system model, update controllers,views and services - not finished yet