Moved conversion methods to discrete class. Closes #1