initial commit
initial commit
calculations refactor