need to finish integration with new view