moving towards more general implementation

Not 100% there yet, but it's mostly working. Now I'll just be able to
change the date parameter.