Done for weekend, minor tweaks done, next, do more research enhancements