a lot of progress:
added angular
adding q