Finished build system
Finished build system
Some changes