initial partials - likely to be deleted
merging with tim's changes