Stashing before clean
Big restructure for GPIO