Removed commented code. Added preliminary error handling