Still a work in progress, any suggestions?