Relaunch

major refactoring and client cleanup