I really need to start testing this locally