Initial version with a simple test working