Get most of the angular logic in place