[WIP] Refacto w/ Angular