Next we just need to add saving functionality