more tech changes
many changes.
I should commit smaller stuff more often