Revert 20eb2a7..8663301

This rolls back to commit 20eb2a729db0684606c628a38dd71ab18f5102f4.
C c c changes

Work on the list view. Parser fixed