Make description a little clearer(?)
Add to TODO