Add working files to branch

Done with the first installment. Work on testing then moving methods into a service.