Some refactors, and just added sass/compass