Most SVs done on setup

Having issues with Parrot SVs. see comments