Progress
Merge okay
Added test mode