checkpoint midway through huge refactor to picc