Most of the worm working. Using this commit as restoration point