indentation
updated to use fluent api; better tests and naming