Adding preliminary TODO