Updated with options and some other things to get a usable binary