Cleaned up imports for several classes, still implementing status images
for commitments.