Backend working correctly now / work to complete front end now