Work almost finish, TODO updated