added todo for code that needs better error handling