Added some todos
Added tagline