Working on math; intermediate commit