Fixing git garbage and committing Aron's code