angular functionality, beta done 0.9b