Make it functional again, not pretty though