last commit before reverting to floats
mostly working again