Initial calculations commit