Added orderBy
Added todo stuff