moving simulation and static analysis back to surveyman
everything compiling again