Add more factor levels

Still need names for levels and need final wild card levels
Add some analytics tracking
Add more levels