Well that's a bit cleaner with everythign broken apart. Now to test.