Sounds like you have already figured out how to implement it the right way :)
I'll also never understand why people throw away a game that is 10-20 hours from being sold... This game is SUPER close to being ready to sell for 4.99$, even at its current state you could easily toss it on steam for a couple bucks and make at least a little money on the side to fund future projects.