First, slightly silly version
Slight cleanup of dependencies