cleaned up. moving to fossil after this