working copy, need style edits
style update