Ready for testing, all guidelines implemented