Flexterm

Replaces #96 which somehow was for a commit, not a branch?