A
FInal commit for the night after adding log messages