much cleaner views in progress