This is much better! Big thanks to @sidemory from F1 for hanging in IRC to help!