call client view controllers
commented out bugs
fix merge