Start to clean some stuff up in anticipation of caching
Notes