Most recent changes

Going to add some sass mixins