Added basic todo from old implementation for refactoring