Rewrote models, update model signaures to match api seperated out models for different parts, code compiles, UI does not reflect models so data is left out