Add authentication stuff... not finished