Checkpoint. Massive refactor, using apps and modular libs