Commitsplosion of much changes
Pulling latest changes from original repo