Finish touches before I close this out for now to focus on other things