local laptop changes...
fixing mergethings
EVERYTHING BLIND-WRITTEN.