In Progress

cgardner rewrites