OD: Hacking to get hourly working; for hackday needs lots of cleanup