Add stuff for pre-janky-specific stuff