naughty little if (unix time) needs to go