major restructuring, with front end being added (slooowly)