Logging

Added logging and stop points