working draft of designer
cleanup and fixes for existing stuff