Phase 2 of extract skeleton done. Seems to mostly work.