Bunch of Stuff

- Add some tests for multiline
- fix formatting of existing test
- major refactoring
- Add implementation for List and Option