Added todos
Updated dist JS