More work (closer to working, but upgrader doesnt seem to acutally get activated??)