All core working. Waiting for templates to further debugging