Big push

Added lots of tests, removed experminetal features