last commit glitchy, commented out till i fix it