[POPL Seg 4] Modified PROC to use procedures

- Doesn't work at the minute though
Merge remote-tracking branch 'github/master'
[SYAC Prac 6] Added client side (still stuff todo though)