switched to angular
tried to merge everything