Got all data functioning-

need to: add private/public syntax

		add all labels and dynamic/static label them