attempt at some backwards-compatibility
next commit, I PROMISE, will be a spec/ folder. :-|