Final commit before switching to project without reliance on v7 support
lib