Added todos, comments, load json once