Adding placeholders and updating TODO