Finished merged, next is bugfixing and feature check