Some todos
Improving angular