Major rework for stability and first alpha