I think I've mostly got it configurable now