Jaws In Progress

These aren't ready for merging yet.