Final commit, added some new custom elements