Finally merged old base files with new blueprint files, now in an alpha stage