client ready for testing
more style
needs more testing