Some progress maybe ? I fucking hate frontend