Working on Issue #10. All that's left to do is base.php and full.php.