I agree. My main focus last night was to get it in a state were it worked and then make it more idiomatic