stuff works now. still fixing churn rate.
merged erik's changes, removed tmp folder from git