Pretty much finished, All user stories done

Still need to complete minor tweaks and final display