All functionality complete with single page application - need to add some more validation