ignore previous....this is better for v1 even though I'm working in v2. I promise i'll fix it later.