Move status into its own module