Working the spec - first cut done