Finished work on statemachine/button interaction