Working version alpha 0.1