Using some of the original content, I made this again from scratch, hopefully better than the first time 'round.