Get rid of totally unnecessary Makefile variables
Read in states as JSON; implement fill mode