Lots of progress, organizing code...