starting to cleanup this.