Rewrote disable/enable logic

closes #27
cleanup