Pretty much almost there beta 2 version

Pretty much almost there beta 2 version