Thanks for the tips all. Expect a revised version in the near future.