More super-secret stuff

Not perfect by a long shot, but getting closer.