Feature/end state implementation

Happy to worry once validation is added.