Seemingly all working, still has debug statements