going to re-write returns
Fixed returns- Needs refactoring

Need to make permenent event listener
Can't refactor, but have test ok.
Returns have been fixed
Added navigation fixes