First commit, with utilities not in usable state yet.