Commit 35

unfinished test for style