More successful parsing of code. Need to sort timing issues with callbacks