Frontend wf

Ready for dev merge