I think this would greatly improve its current level of development

@gracenut, if you're not going to push _your_ changes, you might as well let me put _my_ stuff in there ;D