working save state
merged with master
cool changes
combined with master' *