Infrastructure

Not everything useful is pretty, but sometimes it is.