Scrap work from yesterday and start working with feature branches