Major Update

Updating files so I can start branching. Have some other theories to
test out.