Floats

Recreating this pull request against the new branch.