Will keep working on this & update REAME too, just FYI