Add Angular logic and new jQuery helper stuff