Aol Coding Challenge - Updated