Reverted back to non-angular considering the pending work being done to the project (google: Angular 2.0).