bug 753

Tried reviewing my work, checked about 500 lines and lost my patience.