Updated to new functions and ready for review.