Cleaned up conversion calculations, some reworking of the classes to make things a little more compatible / modular