Preparing builds

Need to manipulate the ASTs but it looks good