Heavy revisions - more exciting gems and a removal script that might work
Ugly merge - need to check this line by line