Testing complete, fully functional, needs polish