Minor reafactor, still planing out the structure moving forward.