Adding server side to the octo