Moved everything to angular