Making progress on my Demon

Getting things buttoned up under the hood.