Build logic complete, although not working yet