Almost Final

Need to merge with Alex