Charlie Gonzalez

We are good now. Thanks @tokuhirom and @yanick

Thanks Yanick, @karenetheridge I don't think I will be able to sit down and work on this right away. If Yanick can do this right away I suggest he work...