Work on proper debugging