Reverted back to original, fuck this hackathon