Add some logic behind the disabling. Have not done star yet as it will be changed soon. Closes #12