Updates for Surefile and Lifestuff WIP (non compile for now)