Program nearly ready for submission, need to improve error handling