Work on debug some more