Bundle update
Cleaned up a few models
Bundle update