Got it sort of working for some things