Still deciding on some structural elements. This commit is mostly useless.