Rest of commit for april16 kata