Prepping for proper error handling and fixing bugs.