Baseline

This is the baseline commit before an overhaul of the internals is done.