Almost working, just need to integrate back into the BlockParts