added first angular bits and updated models