All logging implemented, just needs to be distributed throughout the code