IM mostly fixed according to Brian's directions. Will need to do some additional option handling and cleanups