Cleaned up organization; added decimal time; version 1.2