12/8/14 dauji's work is here hopefully everything works