shaping up this app