Removed common code (put wholly into server side)
Getting table loading correct
Data now working correctly