Weekend + Wednesday Update

Added quite a lot

building and list == placeholders
Else == should work if there is no strange syntax error (not tested)