I know what has happened and what is to come. I also know that the O/S is the amount of shares that have been issued at the time period. To try to include unissued shares as part of the O/S is pure BS. What might happen or is coming is not part of the current O/S period.
State it correctly as you have ... fully diluted ... not that the O/S is that at this time. If it ever becomes fully diluted it will probably be as long as 2019 and personally there is a lot of trading between now and then.