mate - this is super cool. Love how you structure your project (very similar to mine).