live site not working, I'm going to commit what I have here