Refractor back to angular

Refractor back to angular - it's just smoother and easier to manipulate.
Last fixes before merge.
Merge pull request #2 from cmandersen/development

Development