#73 Frontend logic