Continued development for Jekyll.

Might still be a bit buggy. Will have to write some tests...