WIP
WIP
WIP
WIP
Angularized Fixes #9