Better sounding code
Added to-do list