Starting from scratch

Application got too messy, trying different approach!