Further modification

I should probably figure out what I want this to look like before I start working on it.  Womp.