Finishing off TODOs - now just need to get source-debs working properly