Update:  So the work has been going pretty smoothly, the release probably will be pushed to early May since I lost those days at the start of April.  Almost ready, but I HIGHLY doubt if I will be able to fully finish and test in the next two days.  Still, should be very early May barring any crazy events.