I think I've removed all the TODO items and included everything that's on the "possible" list for EAPI 3 now. I'd appreciate it if people could give this a review before I send it to -dev@ and the Council. https://github.com/ciaranm/pms/tree/eapi-3 f6595db..32525af is the introduction for EAPI 3. 33e5bcd..e6b9956 is potential EAPI 3 features. 725d5ae..1c311de is formatting for the new margin labels thing. This'll hopefully get modified before we go live with it. d96c259..b1b3feb are various misc tweaks that aren't EAPI 3 related, but that aren't worth sticking in master for now. -- Ciaran McCreesh