ENH: back to basics...