Working alpha version 0.2