Issue #63 is functionally done, even if it's in a rather hackish way. Needs stylin'