initial commit
first iteration of styling
merging style