Initial revision w/o binaries this time