Added some todos
Added horizontal matching.