Started working through the changes needed for Beta 6