Updates for Alpha

Total overhaul of buld system.