2nd set of changes

*Crosses Fingers* This should hopefully start pulling from our
installation of the SolderAPI