New things finally working - clean up and tests needed