massive restructure/design