Workign nicely now