Finish up front-end stuff, add two more stores