Hook everything together

Final touch-up to pull all the files together, get naming correct, etc.