Not much changed, moved a few methods for organization