startin from semi-scratch on this project again

leaner, cleaner, meaner.