Started work on rewritin whole app