App is almost complete, touching up