Temp adjustments
Revamp and refactor build