Updated dev version

Started work on the disable over feature.