Spiced up old WIP

I filled in most of the empty space from the original WIP