Site calc to new ap schema

For some reason this pull request is lost :?