more refactoring
updated how models are created
started work on breaking out models/collections