Removing types object
More model changes, adding SQL to each for comparison later, will need UserLink class independent(maybe)