more styling and about to have merge conflicts
resolving merge conflicts