Reworking the initial commit and base layers again.