autoloader, code review, code redesign, test