Fooled around with bundlor, but no need for that yet.
beginnings of a huge overhaul of functionality. better separatiion of concerns