VineaShears basic stuff added, with more code cleaning.