I'm also at stupid o'clock here. Let's definitely make a non-debug build and then make as few changes as possible to make it work ok.