Updated to use HashMap and started GUI