Laura Fitzgerald I really want to get this merged by the latest end of day tomorrow. Just needs some small refactoring and tests and thats it