added TODO's merged parse classes

Cleaned up parse classes