Return to barebones

No need to get fancy just yet.