(WIP) Another Redraw

Old on the left. New one on the right. I think the old one was from 3 or 4 years ago?

Will have to do similar variants like the old one.