Full reactivity

My sublime text was configured to beautify on save, so sorry about some indentation changes