Looking good, must solve context issues.