Adding logging
Moving functions around
update site