Off for the night, will chat more tomorrow as I try to clean this up further