Added some structure to the shit