keeping up with wiki
restructured
Now compiling (# not escaped)