Started adding error handling stuff