Second commit

Beginning cleanup of data, etc.