Much Refactor

Such Changes, wow features