Commented error handling, continue to separate ui from logic