I remember this, and playing the old demo. I'm doing the same thing with re-using the same functions for similar 'types'. Demo looks good so far, keep at it and good luck !

Oh and same city I am in!