This is a bigger topic that needs to be broken down into smaller tickets once we decide to start working on it