lots of changes, finishing up crud on contracts