Done for the weekend, will finish up by Tuesday