Removed todo in favor of #21