A helluva lot of updates to make this ish work
angular stuff