Working on new buildfile