clean enough to merge to development to add function headers