Adding some FIXME and error handling.