Added in Layout parsing, need to add semantic analysis/javagen support