WIP - Adding some debug println.  :(