Updated Buildfile base code...

Next is to add tests