Some cleanup and got client input working