Add more debugging, add builder script for testing