Added pre-emptive maintenance

Closes #12