CPU Optimzation :boom:

Lot of back end stuff to improve cpu usage
Merged conficts

:/