Completed requirement 25 and made several bug fixes.