Well, NOW it's done (not the gui)