@shabbychef I've been refactoring everything lately for no reason