Cleaner refactor for #147
Implemented changes to FloatFields for #145