fixed Ws, still ugly.
starting to work on parsing