Temp code to address immediate issue. This will be rewritten soon.