Added a TODO with most of the ideas in my/daniels mind