First version of types
Removing test