Back-End fixed, dummy data controller + dummy data, enhanced design
Back-End fixed, dummy data controller + dummy data, enhanced design
Merged with Stefan's code, might be conflicts