Third Commit

Should be finalized... knock on wood.