I don't mind any approach, just want to get the behavior right. +1 for having 1 bin file.

I'll re-push so we can merge this