Fixes #57 implemented views