messed with teh timestamp functions
cleaned up routes file, and removed unneeded serviceprovider stuff