Finishing making things work. Back to fully functioning, but clean\!