leaving in debugging like a fool, working on make-links! then the core functionality will be complete
removed some debugging, passing basic tests