WIP on adding WFS functionality