margins set
small refactors
first draft