Removed TODO!s for now