REVIEW BEFORE MERGE: Concerns Refactor


Guys... make sure this work before merging. You know the scope of your app better than I. I did not test every aspect.