Changed class from String to FormattedTime
Changed methods, removed return statements
Reorganised based on library changes