Work in progress -- I only need to remanufacture the Swing layer