Working again after slight refactor and cleanup.