Working towards a state module; buggy times...