merging with new stuff.. seg faults on admin1?