Made it almost work