Commiting some stuff I worked on a while back to get the wicci data aggregated. Just fomalizing a home for it.