Final commit. Tweaked dabbled tech