90% done, now tweaks, tweaks and tweaks