Wired up smarter dirty checking logic
Closes #24