Moving to flask, fixing boogs, etc