SNAFU
Friday night commit. Last commit before some breaking changes (over the weekend if possible).