Improve build environment. Should write some code now