Revert 111d8f8..bea020c

This rolls back to commit 111d8f8598cf8274973bf4dae0626741b5cc6021.
tableview works