Some new stuff added including partial login