Tightening things up, getting ready to make an actual app.