Sorry broh for all the commits ;-)