Mayor improvments towards first functional version