Continuing the work (warning: unfinished state!)