Vanilla

Work in progress.