Overhauling

Signed-off-by: Stephen Crockett <crockett95@gmail.com>
Started Separation of Concerns

Signed-off-by: Stephen Crockett <crockett95@gmail.com>