Yeah should be fine, dont think any changes made are going to severely overhaul the base structure so everything will be able to merge in (and if it does change then makes sense to branch off at that point)
Yeah it'll be in a github repo. Currently trying to brainstorm a name and then I'll share the repo publicly