recent changes

more progress
onemore
Revert "onemore"

This reverts commit 9273ab22cbee2dc85392f94d385b8c15317283ab.
Merge branch 'master' of https://github.com/RadioSpace/Tamarack.git