Need to focus on proper shutdown