Calcs look good; need to fix directory handling
adding project file for completeness