Clean up; TODO: use Framingham to guide system identification;