Changed to a different way... still developing