All functionality accomplished and tested, benchmark added