Documentation in progress. Some questions + refactoring