Added functions, corrected file naming convention, added mixins.