Changed to pure object, dont know if works yet have not finished server side