Updated Branch Status

Probably going to trash this branch