New addons

Also ditched some test function that was still in here for some reason.