Only minor jank remaining!