Emergency Commit

Laptop is breaking. This is everything. No time for details