rev work in progress version

planning on re-forking of next attempt at patch request