Reorganized, started adding client code