Actions replaced with Signals and tidied up some stuff