Cleaned up how slots are handled on app