Major updates in coding. Still needs better organization.