Error handling...
More updates. Better code structure....