Continuing to do some minor tweaking, and adding some code that might be handy later if I can get it working later.