Added defines to Makefile & restart capabilites. Need to add amf calcs and look into MPI