approaching complete app, needs to be final tested before heroku