Created a more resonable wire frame with what are hopeful better coding practices.