Trying to reorg stuff so that it works