Fixed a showstopping compile but that accidentally got into the last commit. and consolidated some code. -Dennis
Changed paths: