tests working, some todo's todo like time expiration