Added more functionality

Began to implement the messages and states more concretely.