Still working on angularjs, almost there ...