Featurey

cleanup old stuff and added new killer feature.