Lot's of update, working on security