[wip] Getting the basics right...