todo2

Find better place for this.

Comments...