Layout change
Add some types
Attempt at having a test-suite.