Working on some smaller, stacking-style directives.
Fixed merge conflicts.
Now we're getting somewhere.