hey, seems good, but I just need some time to merge (not while running around the office :-)).
Thanks!