Day 7 planning - time to fix the spec

After consuming a  bit of knowledge from the Internet, I've come to the forgone conclusion that once again, I'm doing it wrong. So tonight I'm going to change from my "Hey that looks neat" spec to something someone else actually put some thought into, modified to my level, here.