PC21 Initial & changes to overall Makefile