Added copy, rearranged some design stuff