Minor refactoring + Golang back end in progress