Messing around
Added webstuff
Cleaned up
Updated components
Removed some old stuff.
Added optimizations to bundles.
Merged from dev