Almost everything working

Gil's missing