Worked on debugging admin client

This is a checkin point before restructuring files