Cleanup things
E2e test
Final TODO
Update Workbook
TODO