Final commit, not what i wanted but couldn't get the RMI to work