Revert "Barebone framework"

This reverts commit b4c27fc6f629f77f1a58a47da69d6a2235fc8618.