Final commit

All waste removed
Front updated
Mock updated
All tasks done